Merge tag 'upstream/2016.13' into debian/master
authorSimon McVittie <smcv@debian.org>
Sun, 20 Nov 2016 15:41:41 +0000 (15:41 +0000)
committerSimon McVittie <smcv@debian.org>
Sun, 20 Nov 2016 15:41:41 +0000 (15:41 +0000)
commite1d62b681ed545d6cf6d5eacb81d4d18f72fea8d
tree1858152c1c65d0c32221baa7165bad5d57315e2a
parenta52e3d4a52954c9ce3498cd8e2de0dc962bd2da6
parentd02ef65cdce39efa01b43b2b58a9a77ccc2c11dc
Merge tag 'upstream/2016.13' into debian/master

Upstream version 2016.13